From c141dd87af860441708b5e8765c99d0546120d5c Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Sun, 11 Dec 2005 00:20:08 +0100 Subject: [PATCH] Rename QEMU device model log file from /tmp/qemu.log to /var/log/qemu-dm..log. Also redirect stderr to this log file. Signed-off-by: Xin Li --- tools/ioemu/exec.c | 7 +++---- tools/ioemu/vl.c | 13 ++++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tools/ioemu/exec.c b/tools/ioemu/exec.c index 195c358296..8bd69764e6 100644 --- a/tools/ioemu/exec.c +++ b/tools/ioemu/exec.c @@ -142,10 +142,9 @@ void cpu_set_log(int log_flags) #else setvbuf(logfile, NULL, _IOLBF, 0); #endif -/* - stdout = logfile; - stderr = logfile; -*/ + + stdout = logfile; + stderr = logfile; } } diff --git a/tools/ioemu/vl.c b/tools/ioemu/vl.c index 09aeff1e0f..d0fa5c5d56 100644 --- a/tools/ioemu/vl.c +++ b/tools/ioemu/vl.c @@ -428,9 +428,9 @@ void hw_error(const char *fmt, ...) vfprintf(stderr, fmt, ap); fprintf(stderr, "\n"); if (logfile) { - fprintf(logfile, "qemu: hardware error: "); - vfprintf(logfile, fmt, ap); - fprintf(logfile, "\n"); + fprintf(logfile, "qemu: hardware error: "); + vfprintf(logfile, fmt, ap); + fprintf(logfile, "\n"); } va_end(ap); abort(); @@ -526,8 +526,8 @@ int64_t cpu_get_real_ticks(void) #elif defined(__ia64__) #include "ia64_intrinsic.h" -#define cpu_get_real_ticks() \ - __ia64_getreg(_IA64_REG_AR_ITC) +#define cpu_get_real_ticks() \ + __ia64_getreg(_IA64_REG_AR_ITC) #else #error unsupported CPU @@ -2645,6 +2645,7 @@ int main(int argc, char **argv) char monitor_device[128]; char serial_devices[MAX_SERIAL_PORTS][128]; int serial_device_index; + char qemu_dm_logfilename[64]; const char *loadvm = NULL; unsigned long nr_pages, extra_pages, ram_pages, *page_array; extern void *shared_page; @@ -2695,6 +2696,8 @@ int main(int argc, char **argv) macaddr[5] = 0x56; /* init debug */ + sprintf(qemu_dm_logfilename, "/var/log/qemu-dm.%d.log", getpid()); + cpu_set_log_filename(qemu_dm_logfilename); cpu_set_log(0); optind = 1; -- 2.30.2